clang tidy readability-convert-member-functions-to-static

manually removed now unnecessary Functors.

diff --git a/swapdata.cc b/swapdata.cc
index f390f7117b35d17a7331269ea4154ea8337d6785..c7eaed4142a4c46694cb101e01edd809a5f28fe0 100644 (file)
--- a/swapdata.cc
+++ b/swapdata.cc
@@ -40,11 +40,9 @@ void SwapDataFilter::swapdata_cb(const Waypoint* ref)
 
 void SwapDataFilter::process() /* this procedure must be present in vecs */
 {
-  WayptFunctor<SwapDataFilter> swapdata_cb_f(this, &SwapDataFilter::swapdata_cb);
-
-  waypt_disp_all(swapdata_cb_f);
-  route_disp_all(nullptr, nullptr, swapdata_cb_f);
-  track_disp_all(nullptr, nullptr, swapdata_cb_f);
+  waypt_disp_all(swapdata_cb);
+  route_disp_all(nullptr, nullptr, swapdata_cb);
+  track_disp_all(nullptr, nullptr, swapdata_cb);
 }
 
 #endif // FILTERS_ENABLED

diff --git a/swapdata.h b/swapdata.h
index 58dd9e99a7e89aa912627bdec477cf65479dd65a..0f829f8bbf84be7fcbf87239a420f6f78bbafca3 100644 (file)
--- a/swapdata.h
+++ b/swapdata.h
@@ -43,7 +43,7 @@ private:
   QVector<arglist_t> args = {
   };
 
-  void swapdata_cb(const Waypoint* ref);
+  static void swapdata_cb(const Waypoint* ref);
 
 };
 

diff --git a/trackfilter.cc b/trackfilter.cc
index 0163ca5b218e223a74bfb7f5980053b619da7f41..c9010f1267e37bb74fca31c604340816160200fd 100644 (file)
--- a/trackfilter.cc
+++ b/trackfilter.cc
@@ -950,7 +950,6 @@ void TrackFilter::trackfilter_segment_head(const route_head* rte)
 
 void TrackFilter::init()
 {
-  RteHdFunctor<TrackFilter> trackfilter_segment_head_f(this, &TrackFilter::trackfilter_segment_head);
   RteHdFunctor<TrackFilter> trackfilter_fill_track_list_cb_f(this, &TrackFilter::trackfilter_fill_track_list_cb);
 
   /*
@@ -972,7 +971,7 @@ void TrackFilter::init()
 
   // Perform segmenting first.
   if (opt_segment) {
-    track_disp_all(trackfilter_segment_head_f, nullptr, nullptr);
+    track_disp_all(trackfilter_segment_head, nullptr, nullptr);
   }
 
   track_list.clear();

diff --git a/trackfilter.h b/trackfilter.h
index 79eccb1a37a2f9ed70ba567cd9002339471586f4..3dba0b4b3bd4fce37ea82f0ecf340436271e1730 100644 (file)
--- a/trackfilter.h
+++ b/trackfilter.h
@@ -220,7 +220,7 @@ private:
   void trackfilter_faketime();             /* returns number of track points left after filtering */
   static bool trackfilter_points_are_same(const Waypoint* wpta, const Waypoint* wptb);
 
-  void trackfilter_segment_head(const route_head* rte);
+  static void trackfilter_segment_head(const route_head* rte);
 
 };